[automerger skipped] Merge "keystore: Move wifi keystore HAL service out" am: 2c62e2b83e am: 29f46c493b
am: 94c3164c76 -s ours
am skip reason: change_id Iffb7dc6bbde6d205519ffdafeb0bd53fbc5611b1 with SHA1 c923204664 is in history

Change-Id: I2f9b1ab697b4930ea1fe61c2a405ca2cf0468b8f