Merge changes from topic "presubmit-am-d782befcd8b04af6aed687af46a7c95a" into...

Merge changes from topic "presubmit-am-d782befcd8b04af6aed687af46a7c95a" into tm-mainline-prod am: 839fda1a

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



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