Merge "Collect number of paired BT devices." into nyc-mr1-dev
am: 2b8f0acc2c

Change-Id: I07a24d222bafa0cfd4a049bf2971a130a245d2a6