[automerger skipped] Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE am: 34b01ce302 -s ours
am skip reason: Merged-In I96f6ce06333ae3527d5b43fcdb7e31edd434fd47 with SHA-1 0ad0828a9b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15257335
Change-Id: I6b3e8cdaaa585bd6d73d2bfc622d97071fd6cc77
This commit is contained in: