Merge "Fix setRecoverySecretTypes to not always set snapshot pending" into pi-dev
am: af13eeb110

Change-Id: Ibae3e0a4a9f8b2af534c44eb8a27b9d28a4177fc