Merge "Use correct user id when checking uri grants for notification." into...
Merge "Use correct user id when checking uri grants for notification." into nyc-dev am: 19d34821 am: 37b0156d
am: bc9d375b
* commit 'bc9d375b':
Use correct user id when checking uri grants for notification.
Change-Id: I1beccb5a7669ee9623a4e809872fb32e0e356530