[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: 35ad3d29 -s ours am: 4ce78b7a -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/+/3174682



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