Merge "Add ExtendableType to allocate" am: 0a9430add2 am: efa98b101f

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

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