am 48956ad3: am 3c58d279: Merge change I738ed802 into eclair

Merge commit '48956ad3fa4bfcd6d386c61872363c9e8990fa39' into eclair-mr2-plus-aosp

* commit '48956ad3fa4bfcd6d386c61872363c9e8990fa39':
  Fix BMW and Audi auto pairing lists.