Merge changes from topic "presubmit-am-85bb9a360df04e4fa2dd6536bf36fa36" into...

Merge changes from topic "presubmit-am-85bb9a360df04e4fa2dd6536bf36fa36" into tm-mainline-prod am: 42682628

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



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