[automerger skipped] Merge "DO NOT MERGE Temporarily increase notificationchannel limit" into qt-qpr1-dev am: 1b1771108b
am: ed1725a5a4 -s ours
am skip reason: subject contains skip directive

Change-Id: I893f946b8c9a88a00021229f408e14a35c45195a