Merge "Only add system language on locale page" into tm-dev am: 66070d7c8a am: 5e1709fd3e am: 864c16d8cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17739084 Change-Id: I587d9e43507870445b2aebbf53fe0cbc64ae2a55 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: