Merge "Check ServiceState when showing dialog" into rvc-qpr-dev am: c121ae683d

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

Change-Id: I64b508ba72f973b00ccd493d597e2a3da004a284