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

Change-Id: Iae6f730236f5aaa15c39cf04bef5ebe925d51643