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

Change-Id: I53f6692c31a78b534cd351c249c3f957ce97fd0b