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

Merge changes from topic "am-cabd4650c28c44639baf0539bd42a1b6" into tm-qpr-dev-plus-aosp am: d00ed559

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



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