Merge "Throw illegal state exception when service is not available" am:...

Merge "Throw illegal state exception when service is not available" am: 572a3587 am: f431f2ca am: cd314a3a

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



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