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: 837696131e

Change-Id: I76348913cc4d0905edb3badc45883bb4d14645ee