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