am c955d8ee: Merge "Allow users to change the length of BT disoverability. DO NOT MERGE" into gingerbread

* commit 'c955d8ee1d2b134f8c41989b545b7b3ed830d058':
  Allow users to change the length of BT disoverability. DO NOT MERGE