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

am skip reason: skip tag Change-Id I9944e098988f176f85aafd896369bdbcae80d6fb with SHA-1 a8ecf7c70d is already in history

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

Change-Id: I441396e7ad21545a8ceba5176269adb8dd70cc1d