Merge "Change how Advertise Data is passed to BTIF (1/3)"
am: 81f7d7e8bf

Change-Id: I29f4d0b65f3fd008d995e45e98ac6f31a98e85b8