Merge "Revert "servicemanager: hard failure for missing context"" am: 060a736711

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

Change-Id: I94fb1123cbc4e9aaf1c5d0297ea0a7f6e6665cd6