am 95c9eded: Merge "BT: Increasing firmware settlement delay to 200ms" into klp-modular-dev

* commit '95c9eded71027bd2bba695ebcf9c1a796efe46f6':
  BT: Increasing firmware settlement delay to 200ms
tree: 99d3f534ff24943d2b1ba10fa0f2e641e0110f88
  1. conf/
  2. include/
  3. src/
  4. Android.mk
  5. vnd_buildcfg.mk