Merge changes from topic "remove_hidl_memory" into main am: 001ed67b am: b29721f4

Original change: https://android-review.googlesource.com/c/platform/build/+/2818339



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