Remove bluetooth, lockscreen and and battery changes

Change-Id: I8d02df0355ae75ee76ccf6347e156ce5e970b6dc