Merge "Separate LE scanner and GATT client BTIF interfaces (2/3)" am: 86f508d45d am: d3ea3edc18 am: b89575fc0d
am: b88c92125e

Change-Id: I1bb38b236162ee9b294b629b5fb0d1f5064f0b45