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

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

Change-Id: If7b4812fea437ff5f319db43f49a1b47abd4b1bb