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

Change-Id: Ic376f6d05c99e41de124463af6ebf2af2114fb0f