Merge "[TelephonyMainline] Cannot use UnsupportedAppUsage API, use appropriate method to replace it."
am: a9ef0e9bb4

Change-Id: Ieb80dc5b79b2af1bd57be3f38547d6258e4b0ea1