Merge changes from topics "bt-hfp-add-set-active-device-method", "bt-system-api-annotations"
am: 25259faa27

Change-Id: Ife08cbcb0490f55c81f239f96aef6e8e2a02e8d3