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