Merge "Expose e.getMessage() from the exceptions in RecoverableKeyStore" into pi-dev
am: 8b60ebc6a6

Change-Id: Ie98c772deea51c25b075a92e2021257f41daf712