Merge "Workaround bad GC of tombstone watcher." into main am: 921b174898 am: ff8f809572

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

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