Merge "Fix ANR in TelephonyStatusControlSession" into udc-qpr-dev