Merge "[MS03] Remove ServiceNotFoundException hidden API usage" am: 7fee9dd710

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1878043

Change-Id: I269b97690532cf81fed01d6e2a32005976b3842c