tree ef2b2d38487b14ecbb578b5ebabd0725f520a042
parent 0a91c084de28f75d1e1d54013377ddfa61f98d31
parent a2fc3e6520819645d61f4388be12c530efffe00f
author Hall Liu <hallliu@google.com> 1603424766 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603424766 +0000

Merge "Use slot ID directly for phone account sort order" am: 36d4a81832 am: be4c44ddcc am: a2fc3e6520

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1469991

Change-Id: I69e089c239402121b0677d0abfbc0fd77534cec4