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

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

am skip reason: subject contains skip directive

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

Change-Id: If185da0b37f0d3c8792d9baa6379665fb058f31d