[automerger skipped] Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE am: 89e61b7f9d -s ours am: b4cd937f15 -s ours am: 0b2538df43 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9b818e30157a80376334fab5922c6bddc0dc7658