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