Merge changes from topic "presubmit-am-6f72bdc3cc444506871d5647fce4bbd2" into...

Merge changes from topic "presubmit-am-6f72bdc3cc444506871d5647fce4bbd2" into tm-mainline-prod am: d7b65337

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



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