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