[conflict] Merge "Pass IRK rotation flag into native" into tm-dev am: 5ce54697 am: 44e9b19a

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



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