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

Merge changes from topic "presubmit-am-a10436ba523c443696b70308db2adac6" into sc-mainline-prod am: 1b4c92dc am: 64bce073 am: 7298d19b am: 73138f6a am: 7b37be45

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



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