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