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

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

Change-Id: I13aff9bc96e465e5a18c8ec44c3c709bc221a8b1