Merge changes from topic "am-5cd1cbe44a314c638f181112c31eb426" into...

Merge changes from topic "am-5cd1cbe44a314c638f181112c31eb426" into tm-qpr-dev-plus-aosp am: 3de0c70d -s ours

am skip reason: Merged-In I76208722bbb7a407ba1f2dc4305a28226166414d with SHA-1 c97296e9 is already in history

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



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