Merge \"Allow system apps to have disabled QS tiles.\" into nyc-mr1-dev
am: 611093b1a1

Change-Id: Ie3f832621d982f45af7d0e4d1b786f429cef9f2c