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