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

Change-Id: Ie9fe05531c97bb50e6bf2c4792b59f1bca931db1