[automerger skipped] Fixes De data is not backed up correctly when user locked (1/n) am: a87b5f88b5 -s ours am: 3f6d6cdc3d -s ours

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

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

Change-Id: I177d6c2a9f2de4815f083e765fdc39ee21dfe6d9