Merge "Limit the number of notis an app can enqueue" into oc-dr1-dev
am: c65071d625

Change-Id: I85e7117a88be1a629a953f1c721faba508d6d424