Merge "[TelephonyMainline] Cannot use UnsupportedAppUsage API" am: 484a87ee am: 7f604083 am: 345213d2 Change-Id: Iefc0f1328ed7923c89907c3bb07ea2206fe9022a