[automerger skipped] Handle non-split pointers for multi-device case am: 9b849a7186 -s ours am: fa99ef5f58 -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/+/3174682

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