Merge "Merge "Use injected instance of RcsControllerCall" am: f545515e am: 3e2e2d66" into qt-dev-plus-aosp