Merge changes from topic "am-9133789c405d40309ee5fd09c8a75e13" into...

Merge changes from topic "am-9133789c405d40309ee5fd09c8a75e13" into tm-qpr-dev-plus-aosp am: 720fdc8d

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



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