Merge changes from topic "presubmit-am-85a3f29dd446454a82629bc9ff08b102" into...

Merge changes from topic "presubmit-am-85a3f29dd446454a82629bc9ff08b102" into tm-mainline-prod am: 78b9a4f1

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



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