Merge "Add more ergonomic API for persisting lazy services." am: b6405c7954 am: 6c2bc861a3 am: 8bf3b14fef am: e78cc3872e am: cde5e163c9

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

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