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

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

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



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