Merge changes from topic "presubmit-am-7d1edc1968704afeabb7ff97c06306f4" into...

Merge changes from topic "presubmit-am-7d1edc1968704afeabb7ff97c06306f4" into tm-mainline-prod am: 60c017c0

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



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