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

Change-Id: Ie212c6105f8796f0e7c4ccf25ea132b8c9f99519