[automerger skipped] allocator frozen false am: 1437e013 am: 6c5a248d -s ours

am skip reason: Merged-In I56b04a0f682a0ba3dc58a42c0a14bb506591c594 with SHA-1 f6555374 is already in history

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



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