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