Merge "NotificationManagerService: add right lock for some methods." into main am: a64fca5861

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

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