Test: NotificationManagerServiceTest Fixes: 194697004 Fixes: 194697001 Change-Id: Ide8d56b8d76019304e0b6339ec15d14ca462d0f2 (cherry picked from commit 70d1d86d)