Merge "Save isCanceled state and restore when rotation" into tm-qpr-dev am: 3028e525

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19267966



Change-Id: I6072236085c1feec6588d8b06931517086f32d48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>