Merge "Fix force close for updating UI after activity destroyed." into main am: c3ea626c

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



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