Merge "Merge "Revert to basic icons in notification info." into qt-dev am: 4a58ec22e1 am: 75e5a38a20" into qt-r1-dev-plus-aosp
am: 83a342467b

Change-Id: Ic5dbe64a9efd50efe2adc85f55bf5eb0312ca609