Merge "Count flags when check advertising data length" am: 9b9a4ede am:...

Merge "Count flags when check advertising data length" am: 9b9a4ede am: b0cdbde5 am: a79c8217 am: b55e698e am: 35ed4bb1

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2138120



Change-Id: Ie57aa748f16d7df1ad86057ed2d9f50ffec533e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>