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

[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 6d8db1e4 am: b8330f18 -s ours am: 983e2fc1 -s ours am: 501f068b -s ours am: fb939df1 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iab55ccd9cf2cfd9fbd2e3859059b03df35ff52ef