Merge "Add removeActiveDevice and enforce BLUETOOTH_PRIVILEGED in setActiveDevice and removeActiveDevice SystemApis" am: df37376e28 am: 6697507c92 am: af597fec25

Change-Id: I11f556a861287cf229cdbd6087d687bff2cca4cb