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

Merge changes from topic "presubmit-am-c948a2e6e650456a904dc2877ffdd13a" into tm-mainline-prod am: d1729692

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



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