Merge "Add RecoverySession importKeyChainSnapshot method" into pi-dev am: 889e78cb28
am: b0850c9a16

Change-Id: Ib6df86c889582368e8129ebf0e5d0d543c520b41