Merge changes from topic "presubmit-am-74daf7c195b84a66ae08146119ceca44" into...

Merge changes from topic "presubmit-am-74daf7c195b84a66ae08146119ceca44" into tm-mainline-prod am: 85da2f98

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



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