[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT...

[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: a4d7db20 am: 80731ccd -s ours am: e0ecb2ac -s ours am: def328ed -s ours am: ee1e9fc7 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I98c9f5c3eb4bcf04506448220778841be7e4a48d