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

am skip reason: skip tag Change-Id Ib56dbbc032236ffe012f36dfb83040b06847f455 with SHA-1 d6a1875bd0 is already in history

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

Change-Id: Ib8bb61385efa0d9031606ecc7e3d8e1d120f7198