Merge "Do not hold lock when calling into NotificationManager" into sc-dev am: 250e7a7d am: 9e0dac34 am: 88e04603

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

Change-Id: I374a6890a74710899ef9a4ad24399761ace913e2