[automerger skipped] allocator frozen false am: 558762c14d -s ours am: a8f810e2d8 -s ours

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

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

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