Merge "Fixes De data is not backed up correctly when user locked (1/n)" am: 354a51c863

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

Change-Id: I18f47c08de38f6a5a283faf5545458274424f4fe