Merge changes from topic "am-07e58fb378f644e39029e33a7dd1fb68" into...

Merge changes from topic "am-07e58fb378f644e39029e33a7dd1fb68" into tm-qpr-dev-plus-aosp am: 03961fd7 -s ours

am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd5061 is already in history

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



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