[automerger skipped] Merge "Count flags when check advertising data length"...

[automerger skipped] Merge "Count flags when check advertising data length" into tm-qpr-dev am: f1692124 -s ours

am skip reason: Merged-In I27fb98b2519b521cb3460e56cf0de57c83da1c37 with SHA-1 b8ad308b is already in history

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



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