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

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