am "Merge "Add Sub-ID-from-phone-account converter method." into m-wireless-dev"

merged from goog/mirror-m-wireless-internal-release
e28ad78 Merge "Add Sub-ID-from-phone-account converter method." into m-wireless-dev