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

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

Change-Id: I592fbd0ff27efbb38bc4eb6fd46a905dc76d0142