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