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

Change-Id: I583fa066aaf12cacb841b10f751ad0ad7a1de237