Merge "[TelephonyMainline] Cannot use UnsupportedAppUsage API" am: 484a87ee98 am: 7f6040832a

Change-Id: I8a1877b1c4b24521bb5151c34897f0a64bd4165f