Merge "Keystore 2.0: Make Bluetooth app ready for Keystore 2.0 part 2." am: 2c2865756e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8a29e8bf6124b12e8236d1674a2da605eb531387