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