[automerger skipped] Handle non-split pointers for multi-device case am: e535b6db41 -s ours

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

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

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