Merge \"Merge \\\"QS: Fix default icon handling for services\\\" into nyc-dev am: 94a20367b5 am: be7b7690e5\" into nyc-mr1-dev-plus-aosp
am: 714adab818

Change-Id: I31e491207bbb1677f40165385d68fdd7bccffc87