[automerger skipped] Merge "Use AdvertiseDataParser::GetFieldByType in loops properly" into tm-qpr-dev am: 9ead4729 am: bc697473 -s ours

am skip reason: Merged-In I8004f471859fb373a4fe0fbe295be7b258481d9f with SHA-1 fe0e3c47 is already in history

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



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