Merge "Fix permission access to wipeData/Device" into udc-dev am: 16d4bd11 am: c4bb36c9 am: bc19ce66

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



Change-Id: I2b6caf82cb7991ab61d9f11633d62f0e3a2f89ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>