Merge "Remove subtitle of system default" into tm-dev am: 107ce2cd

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



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