[automerger skipped] Merge "[Notification] Fix NotificationManagerServiceTest" into sc-dev am: f24ed478 -s ours

am skip reason: skip tag Change-Id I1f124deafd50d257683667ef986b88df1e4b8a75 with SHA-1 3a543bb4 is already in history

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

Change-Id: Ia28b293615aa4e2d1513c2ac70e3aed409af8552