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

Change-Id: I83951018dedfa989684931ec1798695ab5622bc1