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

Merge "Add more ergonomic API for persisting lazy services." am: b6405c79 am: 6c2bc861 am: 8bf3b14f am: e78cc387

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



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