Merge changes from topic "presubmit-am-083081757467413cac605b11b4b2ef85" into...

Merge changes from topic "presubmit-am-083081757467413cac605b11b4b2ef85" into tm-mainline-prod am: d714c873

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



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