[automerger skipped] Fixes De data is not backed up correctly when user locked...

[automerger skipped] Fixes De data is not backed up correctly when user locked (1/n) am: 995b2469 am: 51a029ce am: e3ca6ebe -s ours am: f85f7c03 -s ours am: d6f3b909 -s ours

am skip reason: Change-Id I2ca810bd9495de3bed58378a41b47863c6e8f8dd with SHA-1 995b2469 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/12976643

Change-Id: Ide240dce497835c6c10731d60c95ca3c9e58abb5