[automerger skipped] NIAP: Implement BluetoothKeystore feature am: f635699e am: 50be9f42 -s ours
am skip reason: Change-Id I19ec7b4ece5183c3d401844a089a287a37d324c5 with SHA-1 4dc207d4 is in history
Change-Id: I83b554ce3f887535a0e2e16a1c141ad75430b238