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

Change-Id: Ifcafcd480cbf5111dfa1575ca8127951bfd395df