Merge changes from topic "revert-2818339-remove_hidl_memory-VHKFNXVYFO" into main am: 11e2d03478

Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/2828477

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