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

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

Change-Id: Ieead99da9e0ed20b30b9add94c8003ae69ef9424