am b32ebf30: Merge "Retry unmounts in ext4 encryption"

* commit 'b32ebf308a95ffa937d9b9a36417cdea70add0e5':
  Retry unmounts in ext4 encryption