Merge "[automerger skipped] Merge changes from topic "presubmit-am-5e85a1ad75f141e799291ec6c22492f6" into sc-qpr1-dev am: a30bf19d1c am: 969e9cf845 -s ours am: fca7e7f0bb -s ours am: de67ee49dd -s ours" into tm-d1-dev-plus-aosp am: c8934faaa9 -s ours

am skip reason: Merged-In Idf1ab60878d619ee30505d71e8afe31d8b0c0ebe with SHA-1 1325574d3a is already in history

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

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