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

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

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