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