Fixes: 162233630 Test: android.app.cts.NotificationManagerTest Change-Id: Ib08bfa96b1ff9497251659ff5cc8465fb3da63c0 (cherry picked from commit 55e611da)