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