[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: e935e010 am: 2075ab0f -s ours am: 1de555b1 -s ours am: f7b9efef -s ours am: 91d42c5e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I98c9f5c3eb4bcf04506448220778841be7e4a48d