Merge \"Check uid for notification policy access.\" into nyc-mr1-dev
am: 488153094c

Change-Id: I63134d80f8ddf6e1b375f37617404ede1aeb03b1