[automerger skipped] DO NOT MERGE - Do not show Bluetooth icon when headset is not active am: 91182f3507 am: bf85fd9e0f -s ours
am skip reason: subject contains skip directive

Change-Id: I5889996a4a8a8beb15a127a121ccff58ca1932e5