[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-5e85a1ad75f141e799291ec6c22492f6" into sc-qpr1-dev am: a30bf19d am: 969e9cf8 -s ours am: fca7e7f0 -s ours am: de67ee49 -s ours am: 4ca78b11 -s ours am: b01a702f -s ours

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

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



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