Store pointers per-device am: 0836a30702 am: ef90f09726

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

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