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