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 am: 695b8a75

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

Change-Id: Ic56eb2c49b64449e08b41ec67920f5d998f2fd31