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

Change-Id: Ibe8b12cb0bb57a31e0e1ca077863b2cf63daba1a