Merge "Check Bluetooth app id instead of uid" am: 7d4a354fd5 am: 0efa055590
am: 6e7afc78a7

Change-Id: Iec01fcd319146183e6e958974d494aeeb698c7c5