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

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

Change-Id: Iafc602497bc616645c451cb87373e45e414a020d