Merge "DO NOT MERGE Temporarily increase notificationchannel limit" into qt-qpr1-dev
am: 1b1771108b

Change-Id: Ie783e4fc1542c901f37757a2dceb650ec200ee32