Merge "Post-enroll settings screen shows class 3 strings" into udc-dev am: 9ff72e4205
am: 3e2efc17c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22314938 Change-Id: I0303b339280e1cdf416ddbed1c1e739a45ce8ba3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: