Merge "Switch Keymaster HAL policy to _client/_server" am: 38dc1e2230
am: 6cb56cc460

Change-Id: I3e01853c5efc95cc8c4590a67094eeb5072dea8f