Merge "Remove unused KeyStore field in RecoverableKeyStoreManager" into pi-dev
am: 87860048bd

Change-Id: I0439e8675276f9168fd16d318d81547e9596b472