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

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

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



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