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

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

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