[conflict] Merge "Pass IRK rotation flag into native" into tm-dev am:...

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

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



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