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

Change-Id: I1fa80e1f61ac3e2a8d929261d56334f715a6a377