Merge "Add InlineStdAllocator::rebind struct member" into main am: e66246347c am: 770c1df5cb

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2673907

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