Merge "Avoid creating sp<> from a pointer" am: 51766ce04f am: d840cac9d8

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

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