Merge changes from topic "presubmit-am-3f35f40374184e3480deaf7734bfee10" into...

Merge changes from topic "presubmit-am-3f35f40374184e3480deaf7734bfee10" into tm-mainline-prod am: 9d37f5ca

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



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