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