[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." am: a9042d5af5 -s ours

am skip reason: Merged-In Ibcfeef30c8cb88e244561cac99c034981b84ed80 with SHA-1 6fd185eedb is already in history

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

Change-Id: I8784cead682fca14a2b18d302deeb91efdfed8b3