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

Change-Id: If06e1f171f9920f9d23d9b7fa79909b8da5f2173