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

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

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



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