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