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