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

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



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