Merge changes from topic "presubmit-am-9124f8c741194f318a8638911cb53b3e" into...

Merge changes from topic "presubmit-am-9124f8c741194f318a8638911cb53b3e" into tm-mainline-prod am: fb32c231

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



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