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