Merge "Merge "Check Bluetooth app id instead of uid" am: 7d4a354fd5 am: 0efa055590 am: 6e7afc78a7" into oc-dev-plus-aosp