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

Merge changes from topic "presubmit-am-bc07d8feb3004d48aa07bf8ab49f6ece" into tm-mainline-prod am: b2e9485c

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



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