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

Merge "Fixes De data is not backed up correctly when user locked (1/n)" am: 354a51c8 am: 6653a7b4 am: 989e9978 am: 20f74362

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

Change-Id: I8c68ee56741a90c536b2347bd1e1f4097695aea0