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

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

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