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

am skip reason: subject contains skip directive

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

Change-Id: Icbbe5185229762c6336e3f5ee9e1d22b467ccd81