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

Merge changes from topic "presubmit-am-f9781add2dec454ebf3ee9188c9c8bf7" into tm-mainline-prod am: f95cc099

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



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