[automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: 4ba43d5b am:...

[automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: 4ba43d5b am: 8fdc05d8 -s ours am: b5eb7582 -s ours am: 46d6bdda -s ours am: f521c20e -s ours am: 6b420acf -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib69bdf5880aa0c685f29105c680809cc0016c04f