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