[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 skip reason: Merged-In Ia6bd5658b77a26ab15fea013ec875050457473e0 with SHA-1 ed2ff0f5 is already in history

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

Change-Id: Ic3fdf27f303f2150667d5e516e16454139557295