Merge changes from topic "presubmit-am-8978d550647a4079952ac351a4a9396f" into...

Merge changes from topic "presubmit-am-8978d550647a4079952ac351a4a9396f" into tm-mainline-prod am: 583fe95b

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



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