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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3e3c227bc438ea8da3f652ed7f1cc6b0d94e5d5d