[automerger skipped] Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE am:...

[automerger skipped] Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE am: ee86375d -s ours am: 3e135619 -s ours

am skip reason: Merged-In I7b187c5e79bf4531bdffc7411a033a7c20a54294 with SHA-1 0edb1b82 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1763488

Change-Id: I4bc2ac18c5be722b80df955f06962fe8379cb7e1