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