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

Change-Id: I8134a54bb1fa49006ac7a13f3e827e185d8689df