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

Change-Id: Ie1316a273325cd5308cf9faab61dd0f43f899365