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