Merge "Replace new with sp<>::make" am: 88aed3b81d am: e1e9a0dc55 am: 301ef0b780 am: 0c1d31cc0d

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

Change-Id: Idf924a768dff412706b1e9e0d9b20f6bf36d62e5