am 72a635a1: Merge "DO NOT MERGE Add additional options and receiver to BT tests" into gingerbread

Merge commit '72a635a1e08c1fe316dd91786774677abb11aafa' into gingerbread-plus-aosp

* commit '72a635a1e08c1fe316dd91786774677abb11aafa':
  DO NOT MERGE Add additional options and receiver to BT tests