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