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