am 4e3add7a: am a87c942e: Merge "DO NOT MERGE Bluetooth: Cleanup bt_config.xml...
am 4e3add7a: am a87c942e: Merge "DO NOT MERGE Bluetooth: Cleanup bt_config.xml during BLE Scan" into klp-dev
* commit '4e3add7a':
DO NOT MERGE Bluetooth: Cleanup bt_config.xml during BLE Scan