Merge "Fix NPE of NativeTombstoneManager.TombstoneWatcher" into main am: 8bbd22b445 am: 154710d479 am: 3b84abdaef am: 0e75a92696 am: 540c36caff

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

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