[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: 350478f2 -s ours

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

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

Change-Id: I969995c04aa88a19bd58dc0cb08411fbb5e79f5f