tree cf1f3acf83f8b96a268a725942d3e8d6257070c1
parent 1bf565e95bea09060c76f9e99c403af7b422ae8a
parent 915b05da8228947e164d5cbd8835841273e35ac4
author Evan Tyra <evantyra@google.com> 1559363392 -0700
committer android-build-merger <android-build-merger@google.com> 1559363392 -0700

Merge "Catch NPE in getServiceStateForSubscriber" am: c6e5a7197e
am: 915b05da82

Change-Id: I17071da8dbbf7723f6bc5727cddb27d744465031