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

[automerger skipped] Merge "OOB: Implement generateLocalOobData API" am: b455e49a am: 640dc7f2 am: 045c2178 -s ours

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

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

Change-Id: I76fa953422ba7b40edb06defbac92bcf0271c1d9