[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." am: a9042d5a -s ours am: e3356451 -s ours am: f7e9d2f1 -s ours am: bb37fd0e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2189ef5b8d9c5d8b77e7a155ea47c2786c560d14