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