Merge "Improve the use of pointer" into main am: 315433ca78 am: 2daffc10b1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3278235

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