Merge "Correct Factory Reset activity protect permission" into udc-qpr-dev am:...

Merge "Correct Factory Reset activity protect permission" into udc-qpr-dev am: dd3e3388 am: 650a7e92

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467970



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