[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: dc84e390 -s ours am: 233d711d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I24bd8f34f2fed4f2623358d3c63facec7acb75a9