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