Merge "Avoid creating sp<> from a pointer" am: 51766ce0 am: d840cac9 am: 7157bf72

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



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