Merge "[automerger skipped] Merge changes from topic...

Merge "[automerger skipped] Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-qpr1-dev am: 950fb419 am: e41a97f2 -s ours am: f5b9c814 -s ours am: 6b76d854 -s ours am: 070dd64d -s ours" into tm-qpr-dev-plus-aosp am: 337a78d5 -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: I8be41078af4ab0f22fee5e56776ecf0dec417166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>