tree 18d17ab79a39f341b50f8eb4376488d9e836f2fe
parent 2c4e89c490b88d2faa0b87a2245407c9b7b91a11
parent be4c44ddccb7c4935d7ea6803e8c44fa096d4b85
author Hall Liu <hallliu@google.com> 1603424648 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603424648 +0000

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

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

Change-Id: If4b5e3481dabc290406125041260e2336bc640a9