Merge "Fix NPE of NativeTombstoneManager.TombstoneWatcher" into main am: 8bbd22b4 am: 154710d4 am: 3b84abda am: 0e75a926

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



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