Merge "Fix NPE of NativeTombstoneManager.TombstoneWatcher" into main am: 8bbd22b445

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

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