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: c848a518 am: a9473dcc

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

Change-Id: I12c8acc1f4f72559502703a5a0cb693083b5f181