Merge "NIAP: Make sure that call getOrCreateSecretKey once at a time" am: 0a84c17921

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

Change-Id: Ie417feff681142dca2e9d89e12856d677a4f5669