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

Change-Id: I443bd449131bc242527229b3b238632d7ed1a8b7