Merge "Add more ergonomic API for persisting lazy services." am: b6405c7954

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2177902

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