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