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

Change-Id: If47397bdc5dc7e488b6e6e1dcac059a6e6389f29