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

Merge changes from topic "am-ba439323ed2d4083919772fbe6e679d6" into tm-qpr-dev-plus-aosp am: 0a7e9034

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



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