Merge "[SettingsLib] Use sql to sort subscription info data." into udc-dev am: cd68a55e

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



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