Merge "Add handling of missing ServiceSpecificException" am: 08afbf5cf1 am: 6e5bb402c9

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

Change-Id: Iac4e31ef7cc6d8946fe0db918405b799f1d4a8cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>