[automerger skipped] Merge "DO NOT MERGE - Do not show Bluetooth icon when...

[automerger skipped] Merge "DO NOT MERGE - Do not show Bluetooth icon when headset is not active" into qt-qpr1-dev am: 30468d09 am: 8c8b4fed -s ours
am skip reason: subject contains skip directive

Change-Id: I24cd1f41a73d6b1d15c5ecfe6d519dfd601ec166