Merge \"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\" into nyc-mr1-dev-plus-aosp
am: 38e88e249e

Change-Id: Ib4313f8eb0a0171bdfb1d8fc55f5678181c25686