am aab60116: am cdaeafd4: b/2224837 Changed the plumbing of how alerts/notifications work.
am aab60116: am cdaeafd4: b/2224837 Changed the plumbing of how alerts/notifications work.

Merge commit 'aab601168caec83cf1ca3f235d3a6b308a5dedaa'

* commit 'aab601168caec83cf1ca3f235d3a6b308a5dedaa':
  b/2224837 Changed the plumbing of how alerts/notifications work.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base