Merge "Keystore 2.0: Use public API to get Keystore for bluetooth." am: 735c77d496 am: 049ca029c4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8698a9cc01e00e37c611cea620c2db1a390ef86d