Merge changes from topic "presubmit-am-6b013192ee234543a6f14280eb5746c3" into...

Merge changes from topic "presubmit-am-6b013192ee234543a6f14280eb5746c3" into tm-mainline-prod am: ad444bc2

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



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