[automerger skipped] Mainline: remove usage of hiddepn API...
[automerger skipped] Mainline: remove usage of hiddepn API SubscriptionManager#getPhoneId am: 443ba6fc am: a0edd2f6 am: 85540eab -s ours
am skip reason: Change-Id Ia997291dc13487dad43519641369b4a357614602 with SHA-1 e4275585 is in history
Change-Id: I07254424d9becf34df8af0d56e917d3b0f5c4e35