[automerger skipped] Merge "OOB: Implement generateLocalOobData API" am:...

[automerger skipped] Merge "OOB: Implement generateLocalOobData API" am: c04e8272 am: a1391084 am: 8ae351b7 -s ours

am skip reason: skip tag Change-Id Ic5068c41a2e7fd56d634252c44c912bc0a7c7874 with SHA-1 2380cdec is already in history

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

Change-Id: I76fa953422ba7b40edb06defbac92bcf0271c1d9