Merge "Only add system language on locale page" into tm-dev am: 66070d7c am: 5e1709fd

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17739084



Change-Id: I4a3d997e36c14a1d164109134e296262a32a0f5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>