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

Merge changes from topic "presubmit-am-bace65c5abc044d19d4290071ec1a4e0" into tm-mainline-prod am: d2f4d58c

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



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