Merge "Fixed wipeData() so it doesn't depend on device_admin." into sc-dev am:...

Merge "Fixed wipeData() so it doesn't depend on device_admin." into sc-dev am: 72ca5525 am: 01334221

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

Change-Id: I024c80fd4af40824e01f1912463c03eb8a1e8e7b