Original change: https://android-review.googlesource.com/c/device/google/gs-common/+/2855244 Change-Id: Ibcc32385f0612e62b0219d94edfcdd686a625b96 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>