[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am:...

[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: 472ef639 -s ours am: e903aa89 -s ours

am skip reason: Merged-In Id0a543a695fec5523410b41a289f2a71cd850b70 with SHA-1 b8cf151c is already in history

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

Change-Id: Ibf40fd0c0932ca48e869e65de6ffc7c87685ac30