Merge "Do not hold lock when calling into NotificationManager" into sc-dev am: 250e7a7d am: 7db6bdf4

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

Change-Id: I15ce2dc2f346a37621b129228bc83b02443a8e9f