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