[automerger skipped] Add --non-staged flag am: cf573cde am: 66843757 am: a30cd94a -s ours

am skip reason: Merged-In I27ac000207e1b6ec39890bd382b3751fbb62e265 with SHA-1 d2d672e3 is already in history

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



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