Merge changes from topic "presubmit-am-877e172c4fa74f85876fa80ed0ef9e2b" into...

Merge changes from topic "presubmit-am-877e172c4fa74f85876fa80ed0ef9e2b" into tm-mainline-prod am: c1748393

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



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