Merge "Merge "Use correct user id when checking uri grants for notification."...
Merge "Merge "Use correct user id when checking uri grants for notification." into nyc-dev am: 19d34821 am: eb6ce934" into nyc-mr1-dev-plus-aosp
am: 5dc480b2
* commit '5dc480b2':
Change-Id: I1a0e2f92db6d109645a359cdfb484f069261eb2f