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

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

Change-Id: I28b1bb91331bec61fcf54f84ece296e7ff1746d7