Merge "Inject system services instead of using `context.getSystemService`" into tm-qpr-dev