Merge "Mainline: remove usage of hiddepn API SubscriptionManager#getPhoneId"