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