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