[automerger skipped] Merge "Update TYPE_ADVERTISING_DATA_TYPE to 8" into...

[automerger skipped] Merge "Update TYPE_ADVERTISING_DATA_TYPE to 8" into tm-qpr-dev am: b5b9a4c5 am: 1b564905 -s ours

am skip reason: Merged-In Ic93bd99305928e123a8d0f2af7190cba0411b7f7 with SHA-1 0d45e786 is already in history

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



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