Merge "Bluetooth: BLE app tracking fixes" am: 2174731449
am: 3d8d5dbb56

Change-Id: Ia9b8950f66f31b0d3b78f6e2f6c2314cf0b931f0