Merge "Update to support new shared_ptr returns." into main am: f5a06398

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2825168



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