Merge "Correct the phone ID when list the user plmns" into r-keystone-qcom-dev