[automerger skipped] Add --non-staged flag am: f85f3a29 am: 1c825ba8 -s...

[automerger skipped] Add --non-staged flag am: f85f3a29 am: 1c825ba8 -s ours am: 4475c103 -s ours

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

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



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