Merge \"Check caller\'s uid before allowing notification policy access.\" into mnc-dev
am: 234e1c25e4

Change-Id: I6724832d28362a76cd2f65432d6e805738f335fa