[automerger skipped] Merge "[TelephonyMainline] Cannot use UnsupportedAppUsage API, use appropriate method to replace it." am: a9ef0e9bb4 am: 82587a57bf am: 8aba2bbb7a -s ours
am skip reason: Change-Id Ie2b330e23911198bd6a1aaaa3e03c0ff1ed12ac9 with SHA-1 4841a275c4 is in history

Change-Id: If3b51d182f1d20a60d18335f3b63ea42d3628eab