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

Merge changes from topic "presubmit-am-d842c29bd1bd43a78e30c4e5c8765007" into tm-mainline-prod am: 6b13d60a

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



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