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