Merge "Add SystemApi to setActiveDevice in BluetoothAdapter" am: 52df59acb3
am: 3d59aefb50

Change-Id: Ib5db2cced863edb9e60c81d80dea6102273e69bc