[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 5b49c68d am: 1848cf03 -s ours am: 847cfb22 -s ours am: c0977118 -s ours am: d84f8c44 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iab55ccd9cf2cfd9fbd2e3859059b03df35ff52ef