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