Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/20764506 Change-Id: I2b7c49af576bde829e1561c7509663d83cfa1ad4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>