am 3c58d279: Merge change I738ed802 into eclair

Merge commit '3c58d279abed1da56b0ece74ded5854c509a42a4' into eclair-plus-aosp

* commit '3c58d279abed1da56b0ece74ded5854c509a42a4':
  Fix BMW and Audi auto pairing lists.