[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: 91cade0cf6 -s ours

am skip reason: Merged-In I58f4cd524010ea13d2437abb6bf37cbea0b9f528 with SHA-1 1983e95fa7 is already in history

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

Change-Id: Ia9298b79bca6d7b25cdfc6e2718dd997d4ef84b6