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

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

Change-Id: Ie5bd0130a07d015e464090d546fc625589272def