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