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