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