[automerger skipped] Adding a SettingsManager for server provided conf am: 8239433ffa am: 0cda1da024 -s ours

am skip reason: Merged-In I04bfb4d150a1e4844fae5191df175a92f6d3702c with SHA-1 8239433ffa is already in history

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

Change-Id: I428c2e75cbd9b7c5916664b75b3b22cbe7b35f6b