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

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



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