Merge changes from topic "presubmit-am-5e5e800589e44f6191b43f11ad45923e" into...

Merge changes from topic "presubmit-am-5e5e800589e44f6191b43f11ad45923e" into tm-mainline-prod am: d080ae2a

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



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