[automerger skipped] Refactoring app for server changes, P256 support am: 956a081cb2 -s ours am: 957b173e8d -s ours

am skip reason: Merged-In Id861dcd66ce6d2773aa1d5b5e429bdba2a085a67 with SHA-1 4431de6090 is already in history

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

Change-Id: Iffefbf0d4fcd66d8cb718581ebef3589a4de3163