Merge "Increase test coverage for NotificationChannel" into rvc-dev am: 34621b08e3

Change-Id: If00a5d5c28359554f2c7fb356c93229def9fcd07