Merge changes from topic "am-a8eaeda526cf46149976e0ed042c558c" into...

Merge changes from topic "am-a8eaeda526cf46149976e0ed042c558c" into tm-qpr-dev-plus-aosp am: 2594e0d2

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



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