Merge "Revert^2 "Deprecate android.hidl.allocator after U vintf"" into main