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

Change-Id: Iefc0f1328ed7923c89907c3bb07ea2206fe9022a