[automerger skipped] NIAP: implement bluetooth keystore interface.(1/2) am:...
[automerger skipped] NIAP: implement bluetooth keystore interface.(1/2) am: 4a733223 -s ours am: 0c676f26 -s ours
am skip reason: Change-Id I781d52b8a5b7cc6c02f8589072a37b3214ab6d0b with SHA-1 ad207791 is in history
Change-Id: I623770d3e84d1b01e79e830bfb858d02668abfbc