Merge changes from topic "am-3c796319230641b7a861d5a1d7de0b50" into...

Merge changes from topic "am-3c796319230641b7a861d5a1d7de0b50" into tm-qpr-dev-plus-aosp am: 44d39b36

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



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