Merge changes from topics "bt-hfp-add-set-active-device-method", "bt-system-api-annotations" am: 25259faa am: d16d9336 Change-Id: I525cbc81c450afafd3fcedaf7b1b5e4b17a4162a