Merge "[Security] Prevent malicious notifications from AMS." into nyc-dev
am: c118e62076

* commit 'c118e62076c6defc39001c1618d566e20dda2574':
  [Security] Prevent malicious notifications from AMS.

Change-Id: Id862594b563aede7b14486138b95ef01bf5ed822