[automerger skipped] NIAP: implement bluetooth keystore interface.(1/2) am:...
[automerger skipped] NIAP: implement bluetooth keystore interface.(1/2) am: b83b36f8 am: 466113d5 -s ours am: 67c48b34 -s ours
am skip reason: Change-Id I781d52b8a5b7cc6c02f8589072a37b3214ab6d0b with SHA-1 4a733223 is in history
Change-Id: I17f360f459045589ce8b52ae70e777236191b9c6