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

Change-Id: Ic36dbb69f0eeddd85b17579b2fc90f75349e4ca3