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

Change-Id: I8cd4834dfc09a5855fde4f1bb6facc205564acbb