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

Change-Id: Ibac82dc5a181bd43ab1c7e7f2dd6f3412d200ec9