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

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



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