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: 12c61b00

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

Change-Id: Iff94defece97ede092c6236da4833b7b3907e955