Merge "Bluetooth: AdvertiseData parceling simplification" am: c7da241b3e
am: 3ee6eed62f

Change-Id: If599de8cb4b5dc5531a5ce895b60c712108c5d3b