Merge "Use correct user id when checking uri grants for notification." into nyc-dev am: 19d34821b9 am: 37b0156d21
am: bc9d375b7c

* commit 'bc9d375b7cb8448abdc84e5720fd8140b6ad7e3a':
  Use correct user id when checking uri grants for notification.

Change-Id: I1beccb5a7669ee9623a4e809872fb32e0e356530