Merge changes from topic "presubmit-am-758fdbdd03e34763bc786df64c55af0b" into...

Merge changes from topic "presubmit-am-758fdbdd03e34763bc786df64c55af0b" into tm-mainline-prod am: 9b365b4b

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



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