Merge "Replace new with sp<>::make" am: 88aed3b81d am: e1e9a0dc55

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

Change-Id: I5d2649e0fa06333a495c6ce0bdad3aff1683e956