Merge changes from topic "am-98f7a08062ea47b9aa6a5629e57b502a" into...

Merge changes from topic "am-98f7a08062ea47b9aa6a5629e57b502a" into tm-qpr-dev-plus-aosp am: 05b3956d

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



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