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

Change-Id: I25cf06b504f1e4cdaa5ee1f0d7bf412947f7bd29