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