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

Merge changes from topic "presubmit-am-ea582a154fef4cbc9b57e3c967f1016b" into tm-mainline-prod am: 6655eef9

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



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