Merge changes from topic "presubmit-am-9a89763689094e51b347f585fe1f995d" into...

Merge changes from topic "presubmit-am-9a89763689094e51b347f585fe1f995d" into tm-mainline-prod am: 0e972ac3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17667413



Change-Id: I7e35c36ea471f7f8686575581cb9279a0ca497cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>