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