Merge "Revert "Set ConfirmDeviceCredentialActivity non-external in FRP"" into sc-dev am: a328111013

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

Change-Id: I6b0237c99dafb8520eaa92dc7cd621cee7ce0d12