[automerger skipped] Merge "Handle non-split pointers for multi-device case"...

[automerger skipped] Merge "Handle non-split pointers for multi-device case" into main am: 454e2fef -s ours am: a04f638e -s ours

am skip reason: Merged-In Ia295c1d9d941383792e90a3d6fd981473af8f015 with SHA-1 27fc9f1f is already in history

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



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