[automerger skipped] Merge "Check ServiceState when showing dialog" into...

[automerger skipped] Merge "Check ServiceState when showing dialog" into rvc-qpr-dev am: c121ae68 am: d04d4205 -s ours

am skip reason: Change-Id Iee8091921ecdaba0c18f67080348240b8b8f67a7 with SHA-1 15012a9a is in history

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

Change-Id: Ic9f66104c2e0557130dd6179a27b0aeecde81fd9