Merge "sepolicy: Add new wifi keystore HAL" into oc-dev am: 29f273ce6a
am: a21b8b0e1f

Change-Id: I959ce59a098036326ebfc3244972519fd129f364