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

Change-Id: I82db19aad214fee9aeec8a56e6e1efd13630a616