Merge "Separate LE scanner from GATT client (3/4)" am: 1f4fc31367
am: 7fd804c526

Change-Id: Id319acb96d70749c5abc78b7279a4542145fbdad