Merge changes from topic "presubmit-am-6170104819c543729fa6bc3469e8cc1d" into...

Merge changes from topic "presubmit-am-6170104819c543729fa6bc3469e8cc1d" into tm-mainline-prod am: a067e02a

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



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