Merge "Don't use std::allocator::pointer" into main am: 55af483b am: 1e1940d4 am: fb3c316d

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2901505



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