Merge \"Check uid for notification policy access.\" into nyc-dev
am: 8f17d2a48b

Change-Id: Iade2316b64a8d6dc43636fb292c08dbf82c9dc59