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