Merge "Guard against NPE in ServiceConnector" into rvc-dev am: 892d269b65 am: 163686b1b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885859 Change-Id: Ie245cac505ab85ab35767a27111d1661acb1a12a
This commit is contained in: