Merge "Limit the number of Notif Channels per app" into qt-qpr1-dev
am: f842f7fdcc

Change-Id: Iff27466313f71e7fd3f4b181cd531f715c87a936