Merge changes from topic "presubmit-am-d8f5066444f243d0a0e8921fe51486e6" into...

Merge changes from topic "presubmit-am-d8f5066444f243d0a0e8921fe51486e6" into tm-mainline-prod am: db07082b

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



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