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

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

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

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

Author: Treehugger Robot