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

Change-Id: I95f7fd04b4b81c51a36878212badfa3e8820fb92