[automerger skipped] Merge Android 12L am: 2fa2de3be9 -s ours

am skip reason: Merged-In I01876d5a5ff122203d7ba95c60c7eb4db0e15815 with SHA-1 a6deaa0884 is already in history

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

Change-Id: I7181bd34be239183ad555a094c7de6bd89e3e4d3