Merge "Fix permission access to wipeData/Device" into udc-dev am: 16d4bd11 am: be4b16ac am: 6d0ffab0

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



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