Merge changes from topic "presubmit-am-1e77a6c8c3ec496082e579b3aef160de" into...

Merge changes from topic "presubmit-am-1e77a6c8c3ec496082e579b3aef160de" into tm-mainline-prod am: ddef0f24

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



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