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

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

Change-Id: I8fc78285bcd58a06a0c8387ec4f39ea81e375bbf