Merge "Fix GATT client leakage when scan is throttled (1/2)" am: 3cc1ad87f0
am: d019cce887

Change-Id: I24d4dbf1344b13c558aa6974dfee6fd0e8549056