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

Change-Id: If3fe1c1c02626f1cd0f38f658c5ddf8c95ec0117