DO NOT MERGE Temporarily increase notificationchannel limit
am: b8bec9e55f

Change-Id: I0e4ce66ad0df4aa117276d4bc3c9962db9fb6561