Merge "Dismiss the suspend dialog if conditions have been modified." into...

Merge "Dismiss the suspend dialog if conditions have been modified." into sc-qpr1-dev am: 912d8945 am: 991929b9

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

Change-Id: Id3b415b62917c73d1f8683002d97574770e435a6