Merge "DO NOT MERGE ANYWHERE Bring back support for legacy bt_config.xml" into...
Merge "DO NOT MERGE ANYWHERE Bring back support for legacy bt_config.xml" into cw-e-dev am: 866c0816 -s ours
am: 3a968e68 -s ours
* commit '3a968e68':
DO NOT MERGE ANYWHERE Bring back support for legacy bt_config.xml
Change-Id: I21ffcd61c64c4e7d915b9aff721477dec85e9ebe