Merge \"Merge \\\"Don\\\'t show the shade background for heads up...
Merge \"Merge \\\"Don\\\'t show the shade background for heads up notifications\\\" into nyc-dev am: 6b6bf9cd am: f56bcc79\" into nyc-mr1-dev-plus-aosp
am: eff656f4
Change-Id: Ic790cbbb41468f440a34e7b38d8ff8fdf5bd3183