Merge "Merge "make the notification enqueue rate threshold a setting" into nyc-dev am: 43c3a7e5a7 am: 35f49c5968" into nyc-mr1-dev-plus-aosp
am: 9a487584dd

* commit '9a487584dd9752fe29da88c49cb26965ef658b5a':

Change-Id: I508b048f2f97b29e8d4df2ca757d5f323ad3aeab