[automerger skipped] Merge "Merge RQ2A.210305.007" am: 603a44d9 -s ours am:...

[automerger skipped] Merge "Merge RQ2A.210305.007" am: 603a44d9 -s ours am: 913bc4bf -s ours am: 5a95fef4 -s ours

am skip reason: Change-Id I6eee7a4b0960b767b6620c8b93dc252422c42f25 with SHA-1 6ee1f2d8 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I330cb26c550108a80da7fa876590fe53cae5766a