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