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

Merge changes from topic "presubmit-am-d2fb8e1cab9f469d997bbe6f898c6870" into tm-mainline-prod am: a439a9a9

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



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