[automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: bd49f9e63c -s ours am: ef6e822bba -s ours am: 538a0a9a1f -s ours

am skip reason: Merged-In I8bbcfa1c3fca4e4729fdf60effa4e963b4b606ca with SHA-1 9fbe22ec81 is already in history

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

Change-Id: I5fb52ed3f9ee840f52951f1e6453ddfe249a7817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>