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

Change-Id: I217cb9b9c3c58c5269f2a5dacf365da64b0e54b5