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

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



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