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

Change-Id: If661f21a43a0142ffa9c67d115c1f6c71e6799d4