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

Change-Id: I906016249dfb4667bfcaafde07900eee1d90570b