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

Merge changes from topic "presubmit-am-6b013192ee234543a6f14280eb5746c3" into tm-dev am: d2ec5829 am: ee5858e4

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



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