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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d74b82fce3fc92ecace09d5a57550e18f7df95c