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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e621f1068bb16161f3d6c77896b1d33d622af09