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