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

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



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