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