Merge \"Don\'t allow enable/disable of tuner on lockscreen\" into nyc-dev
am: 8933c41b35

Change-Id: I2e24199ee933ac9d18c97858f27408092c3546e5