Merge "The PK settings UI should show subtype labels instead of the subtype's language names." into udc-dev am: f826b3f427
am: 91f72db16a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809546 Change-Id: I85a0a41b4a261c2d626135f59f1c310c698ffb13 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: