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