am 266045e9: b/2224837 Clean up Alerts/Notifications

Merge commit '266045e9a016d2252b2532881799b8edf27f5327' into eclair-mr2-plus-aosp

* commit '266045e9a016d2252b2532881799b8edf27f5327':
  b/2224837 Clean up Alerts/Notifications