Merge "Merge "Bluetooth: AdvertiseData parceling simplification" am: c7da241b3e am: 3ee6eed62f am: 272a45e493" into oc-dr1-dev-plus-aosp am: 2965f85328
am: 2cd35f32bb

Change-Id: I76e42da4487723a8c8960275599d203890d15739