[automerger skipped] NIAP: Implement BluetoothKeystore feature am: 1ac6f03b am: 02cf9db2 -s ours
am skip reason: Change-Id I19ec7b4ece5183c3d401844a089a287a37d324c5 with SHA-1 f635699e is in history
Change-Id: Ie8bb98b564e8f63be03a11782a30f1f93fb0055f