[automerger skipped] Handle non-split pointers for multi-device case am: 9b849a71 -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: I78495fae9e4559eb508cb8b0d25d2121bee08d6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>