Merge "Revert "Fix force close for updating UI after activity destroyed.""...

Merge "Revert "Fix force close for updating UI after activity destroyed."" into main am: 0583090e am: 4e2320c2

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



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