Merge "Add the onDeviceOffBody API method to KeyStore" into cw-f-dev am: f0b51e9db7
am: f481b6b65b

Change-Id: If214d94103771102903a66b941008402657d4e22