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