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

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

Change-Id: I2f1995016d9b33e856a652600b5376b969ffc097