[automerger skipped] Mark ab/8191998 as merged am: b6de19fa4a -s ours

am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 837917a6a3 is already in history

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

Change-Id: I25faa6ae899b008999de3cbad950929d6388b87f