am bee67db7: am f1b2348d: am b34de6be: Merge "Fix adb backup for encrypted case" into lmp-dev

* commit 'bee67db720e33f830714f4bada6f712a25dd7fad':
  Fix adb backup for encrypted case