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

am skip reason: Merged-In If7f9b873a59f156171d3724511c0bc75ae83683c with SHA-1 aa768844ac is already in history

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

Change-Id: If24aa0bcd6474a2a63aba27e3055bdd9a3632055