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