Merge "servicemanager: fatal if not ctx mgr" am: a06d5455 am: fd133c02 am:...

Merge "servicemanager: fatal if not ctx mgr" am: a06d5455 am: fd133c02 am: 22c15c5e am: f992c449

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



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