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