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

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



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