Merge "Check the return values after updating Recoverable KeyStore Database." into pi-dev
am: 6f67f7d89a

Change-Id: Ica0b656e207e6a46ec9c54d1e23fcc3241369673