Merge "Fix GATT client leakage when scan is throttled (1/2)" am: 3cc1ad87 am: d019cce8 am: ced5e47a am: 2a43dcbc Change-Id: I9dc49a2a30eca9ce4d78ad8d5b289db1600f2ff3