Merge "remove observer in destroy() bug:388189795" into main am: a2ac5e00

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3438401



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