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

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

Change-Id: I55046f06652b37702f48d7e36b121e893e9ffe5f