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