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